Added more responsive