added class stuff