UPDATE FOR BUG SQUASHING