added references, changed order