Why not fix the issues with the current implementation as well as rewriting it?