moved values into modules