Moved from yambaall branch