changes for make compatiblity