changed macro for current_user method