removing hardcoded return values