Change a few things in the implementation