adding in additional checks var