did some changes for functionality.