leftover + small bug