Added intial/ending constraints and on node points