minor changes
using theirs