get back to simplicity, without tests :(