more elegant, continues to work