rework and hopefully complete finish