Contains Freds Soeed Up Fixes