Need your help to improve my setup