Rework finish, added function returning values