removed hardcoded 16 limit