added current user check