Actually fixed structure now