Updated with a few more suggestions