Added final funcionalities