finished pr 44 and 47
removed unnecessary import in pr1