lots of changes
removed sensitive info