bug fixes
removed pinning