Moving to primary class