Updated the design, confirmed it works