Notes for future code changes