Updating to new fancy style