Started using the types in checking functions