Began fixing double entry problem