Updates to transformer, not finished yet