Updates to getdata-009 project