Adykto's improvements