added 32S type, changed structure