updated my own main