changes to be more responsive