tweaking functionality again