In the middle of fixing some bugs