updated w/ proper ASF license headers