Code is working fine now EVERYTHING is merge together