#6 Added player wrap around