Reflected some recent changes