Comments for future edge cases