Prepare for merge
Made some changes