Changes made by Sebastian Jordan (sjordan@r2logic.com).