revised layout v0.1