Updated to account for missing