1.1.8 ~ making stable