solved issues of 29_march
bugs