Fixed structure and added basic localisation