Trying to rework whole design