Bala fixed some stuff