updated class mechanics and interactions