update makoto less structure