changes with re-design