removed hardcoded variables