Just adding a few things :) Hopefully it's better than the first version.