last version before remake into final