changed setup
changed order