Alot of recent changes