Added suggestions in comments