Moved pwselection code to a dedicated file