made more compact