o - some changes