simplifying finished (for now :)