fixed task 01 need to work on rest