Updates for rprog-005 attempt