Updates based on Shannon's comments, new assets