replaced the code in the master with my code