added commentary and removed saving surfaces