Other parts of code put in order