added flights and changed riftPlayer - getting stack overflow