Changes look good

These changes can be merged (once I figure it out.)