removed case statement for setting object