few additional changes