improvements for eotasks