added halley's stuff