I've merged the two Cyrus threads in to one.