some following ideas/changes