added case statement again