added paranoia features and removed export