Updates - still seems to break with FAME CPU core