Simo more improvements