durrr...added noah veltman's stuff