changed sep of cond and tags code