cleaned up + fin