Updates as per @basecode's feedback