addresses #85, needs to be tested on dev deployment