Making it more responsive