Added and cleaned the previous commit 0a5ac29d1ae652f292fe77498f1767310a13ec1a