removed two hardcoded values