Added a few changes..