renamed and simplified