Removing more debug lines
Changing order of execution