In Progress

Private for NickolaS (fix of other pages)