New functionality update. CAREFULL linking error! to investigate.