revamped to be more ocndenced