Finally fixed all of Raj's issues