renamed and did some problems