Even more logic! Ox Statue and Shuffle improved