New discussion

Further improvement is needed

#2 opened about 2 months ago by Candala

new merge please

#1 opened 2 months ago by kalle07