merged with davids and removed a case statement, which made no sense