updated everything I've done so far