Changes to make it work in the lab, fails make just