constants in Setup 1&2 modified