move the pr sent by Afonso