Changes from working on manual