tweaks and finishing touches for this