adding more responsive fixes