Refactor and add Functioning post select field