0.0.3 with less unused code