Updated with Emma's design changes