fixing size check and names