Made thing more efficient