improvements after some tests
improvements after some tests