tweaks from class