added some simplification for future responsiveness