Changed code to comply with task refactor, not running correctly.