some paul changes
more changes
finished search