Added checkpoint for official fork