bug fixed and finished extra task #2