refacotirng
fixes #1