entity class and position class added to the mix