Updates

Round 1 updates
TEST!