Variables moved to propper places