leftovers fixing