Rewrited functions according to the issues