Let's keep this method, but get rid of the one above - we don't need both.