Adding some recent changes...