Changed to none type checking