Improvement/perform real changes