added locasiation to new decision + bugfixes