Code correction & completed application