Changed the structure around a bit