Main method edit!
Hopefully final