Small changes to make more responsive