precompile
move add_and_remove_small back