Alot more fixed