Please pull my changes in development.

Please pull my changes in development. 
It is tested for Brabantia on the cluster and works. 
It is a lot faster.