Got rid of gaddag (not using one yet)