fixed replanning issues
mega merge