Tolian changes

Tolian changes