Solution for both 4.1 and 4.2