this is for after the merger