Move stuff around - for consistency