fixeed one of the  bugs still in progress to be fixed