new prop functions and some changes in old ones.