removing hardcode