did some fixing