switched tags to not use added properties