pup focal started + optimisations