Taking account (8/27)

Taking account