Rearranged def 1