updated from lanyon changes