1.4 ready updated with a few edits