improvements overall added breaking