Fixed most of the code