merged with keith
