0.9 refactored for Baksia