Extra funcionality DONE!!!