changes on 6_24