Fix animation and switch to gold