added frames, other mumbo-jumbo