Changed up the structure a bit