Update/Tweak for initial work