Update of current changes

It's broken I think...