Added suggestions from Emanuel