Hopefully the final solution