Fixed more code

more playing with it