Performance improvements(Might need fixing)