stable version after few fixes