Adding in some black magic I don't like yet