structure improved plus updates stuff