as per @samueljohn suggestions