Rewrite for .24