Adding some initial future changes