Running but need improvements