Fixed and added to class