wip
wip for issue #25
remove depracated