Reworked and retested with new schema.