Put variable definitions first
Relase version 2.6