more changes alot