Working in new functionalitties