fixing my mess