Alot of changes and work