Reflected some current changes