Changed a little on the design.