Making it little more responsive