added dev switch