Alot of fixing