hardcoded values removed