That should do it with first round bug...hopefully