updated some modifid functions