First pass at fixing