update instance and schedule add TODO and comments