Latest changes and added node-red flow