Done with major variables - Except a few