A little bit simpler code