updated objectives and TODO