Last updates from old repo