System fixed for new class design