Some changes after discussion with NiKoyes