updates and tweaks to the original