Fixed some of the changes suggested by Immad