Optimization PSD

- Sida 18