Added suggestions from Miguel