refactored some var names and broke the system