added note and TODO