Some edditions after checking in class