with major bug fixes