updated with NodeJS love