added the non-manual stuff