Added *by* logic. Removed pop for non-synced demo.