renamed and added property check