#3 : improvements