removed comment
mixed
merged
added memory units