Comrades are now generated in correct places