even better solution, but last 2 of 5 pics still wrong