Added lot of wild hacks