Fixed one v one and Legolas classes