refactory trying to remove the dragon