Changes as requested

Looks like these work.