Improved hand making code