Changed assigment ordering