Updated version including bins