alot more changes