few more suggestions done