removed left over hardcoded values