Dar 1623

everything tested, easy changes