HACKING, TODO: Adjust for recent improvements