removed hardcoded stuff