Fixes #127 - performance to implementation