Change setup, added sources