Updating with code tweaks