Some changes to plugin not sure if it is working yet.