Added for debugging at Yujin