New update, almost working ;)