some changes for better testing