Code is shorter now