few experimental changes

can be reverted later