1-24 added, space modified