fourth pass- type changes
fifth pass
added to reflect site