Merged symbiotech's relevant additions.
merging stuff