got rid of swap thing