Mae some changes