merged correctly with kingtak
merged in tylers branch