Changed the notation for vars, however they should be removed from here