replace custom code with core
updating readme