Updated feature: Improved 0e3788e