Added various hacks and CODE SEARCH!