#10secart #2 & some nice changes