changes from blshkv
pushing updates from blshkv