testing and modifying accordingly