name changed, small improvements