move #savecloyne, better way to fix #4