Many changes, edits, additions!