fixed up mess