Incoporate changes from Ms. Camera's edit