Final tweaks before adding new functionality