One last quick change before release for demo