Markus-ify

Assisstion's edits