Adding two additional boundary events implemented