fixing big mess