Major tweaks based on current design