Updated according to @juancarlosfarah's feedback