Addinging features
Added more features