reverted to non inline vars