Changes based on code reads from Shawn anf Fahd.