Merged my code