Universalise

Make universal