custom recur and bug fixes