Changes to make it coexistable with the none dev version