queue cleaned up and catch_it added