(master) added dev class back in