code modifications

code modifications