Made changes per @Panya's suggestion/patch