move def in more visible place