various changes 2