Latest version of the snapshot with modifications based on your comments