even more hardcodeings removed