dan0720-24 updated