modifications on main and manifest