added more to the class.php