[AESH-223]
further work