Added new trees, updated water task to non async