Added Michael's code
Layout change