synchronized to original BlackBox 1.6