Updated to allow for check in .ini