Small modifs
Struct implemented