--STABLE--
Refactor