Changed code flow