added the last modifications, still has a problem