Updated changes to reflect situation