added frames and such