Updated to require less markup