update #44 with some slight views modf