recompile+code shortening+additions for testing