Paper#3 + many many changes