Attempt to rewrite stuff