SMall changes and skeleton for koutsuu