Pulling plugin from khawkins