ADDED: Final Commit with Mods