Changed a bit on 2