Minor changes
Updated script again