new functionality and tweaks