major bug removed