Changed and added condition