1009 1018 some changes