added markUnsafe calls