Made more changes for the competition