We recommend that, in addition to the implementation of the Mental Health Units (Use of Force Act) (i.e. ‘Seni’s Law’), all Assessment and Treatment Units (ATUs) are closed within two years and replaced with person-centred services that are: i) designed for easy discharge as well as easy admission; ii) physically designed and maintained to meet the needs of autistic people and people with learning disabilities; iii) located close to the homes of autistic people and people with learning disabilities; and iv) only admits autistic people and people with learning disabilities for short periods of time.