Deliverables M24 ... here we go
first changes