new fixing some bugs