Streamlined changes over from pixalia.