feature06 implemented
feature06, refined