Added subterfuge and clean up