adding all the changes asked by sean and team