cleaned up double ups