sooo many changes