A few modification