15 minute commit, only did testing and debugging