refactored change event states and submitting to main calendar