cleaning up add, more to do