making it work in demo2