first round of presentation layer updates