Updated with some ideas