Rewritten and improved, again!