before breaking changes
proposed changes to #55