Baulk handling now in Baulk class