Modified BaselineTask