refactory again ;)