Added some extra variables