Actually implemented changes

See #32