Modifed architecture