updated code and code traceability