Is there a better implementation?