Added span5 and span7