Updated to latest from original