amended to include arrays