Updated/improved a bit