Final commit pending testing for getvar