Made more changes to match Yas's design.