updating and optimizing
minor tweaks