alot of changes semi done