#30 some changes