#30 few improvements