merged my code in