Trying to fix my mess