implemented recommended changes