New features

plz check fot the changes and merege the branches