Needed changes to reflect situation