1.1 update

Reshuffled variables