changes from litlingon
merge