Disabled collectfast
Undid changes in last commit