Final Voting-PSA

features/shorts