moar fixing up