javascript added and seperated and merged with marissas