modified 2 and 3