redesign of peer class