first version on enhancement
first fixing
all works