Few changes to better parametrization and user-friendship.