PSD3 Sprint 1 Version 4: Updated codes