now with more responsive