Some updates. Probably does not work yet