#3, move constants to options