added some more functions
merged
merged
merged
merged