Tag 504 modifications