responsive improvements
merged conflict
function only once change