Everything should be working now, preparing for 2nd submission