Functions check for initialization now too