modify:: from sugestions of hayashida