Updated feature 5.2