Fixing this for the real world