New structure tested and working