milestone 2
milestone 2 + tostring improved