Changed some code to populated drop down list