#41 Multiple implementation

(The existing one wasnt working as expected)