removed deprecated 'before'