Slight modifications. Still needs reviewed by everyone