Fixed some of April's code