some changed suggested by Rob