made some changes for self usage