Retyping for clarity