slight updates to Joe's script