(fixed includes, changed comment, etc..)