should be better this way