More code and comments...