Small changes so I can experiment with reflection (in a different file)