changed a few functions in universal plugin