Rewriting after I messed it up