Made some design decisions