Final catch up to develop before 0.3