Another tweak to the code