Made it more responsive