updated types and created tools