Even more changes to reflect move from STD1 to STD4 (Project Lydia).