Reduced code as well