Updated design based on PSD