quick redesign w/ Ellys help