Another attempt (I need to test using the server hence the number of commits)