added t tags
added t tags
major design flaw fixed