try some modelchanges, find a final strategy for it