Moved faking logic into Accelarizer
fixed merge conflicts