Integrated some changes: still structural