Added a few additional changes