added some ideas for 1.5