Fix it all maybe