PR: New implementation and tests -> master