Changed name and minor tweaks