Class improved