Changes based on julian's script.