v 0.41 lot of changes