merging lance's stuff