Fixes for tommy, need location to add/delete