Updated to work more thoroughly