changed from hardcoded