removed a lot of checks for current user