hopefully the finished version