Fixed request, still only safeState to implement