more changes as per gsvelto feedback