Took out warnings and extra variables