updated based on new warnings