bug fixed
assignment finished