Finalized, works with 1.6.2