REALLY fixed starting locations now