changes to package to be more 0.9 like