Yoso's small changes