Added a few changes