updated to latest work from sat