Making changes as instructed by Sebmaster