Some changes to decrease code...