Added a few changes
Small changes