I feel like I've improved my design quite a bit.