changing some classes to avoid calling unneccesary players