Last tweaks by atsukamoto