[@Proleptic]

Made some more changes just now