added extra date + permissions check