[@Undine]Made le changes and added some ideas