Changed the fucking structure