BLD Start improving on 0.5.1