Changed variables for better viewing