changes for better testing stuff