More modifications/additions per our conversation