removed some extra variables