Updated to support part 2 of the project (not working)