BUGFIX: remove epsilon argument and repeated function def