Major rewrite, nothing is better than before