majority fixed
changes merged