Finish but need some arrange