fixed parts added pre difenid functions