Changes from more suggestions