fixed my mess