Testing and modifying as required