fixed data locations
added needed data