maybe better solution...