modokiblack-cleaned up madeleine -y