changed functins order