remove MESSAGES feature and adding new feature