Changed over to array lists