changes based on julian's script