refactored finished at classes