Added auth check from scott-42