And fix bugs on the last one