Changed to list and alligned