Solves my problem and is backwards compatible. Looks good.