first timo commit.
2nd commit onto timo branch.
fixed merge conflicts.