fixed structures
fixed utils
updated utils