functionality change, updated tests