Be alittle more efficient