Added temporary code for architecture flip.