More Attempts at fixing.