committing the fixes