Commit: Final w/updates 2