Fixed and add funcionalitys