After a few modifications