Updated to accommodate new changes.