some mor changesome mor changes