Implemented Simon's recommendation part 1