Minor modifications to get LIST working