Bug fixing Level 01 and 02