Adding method, cleaning up driver