Buf fixes -> commiting code to change work station