proceding with the fixes