Final client touches