Right - will move that code down