A bit more functionality and new soversion