Added some recent changes