mergin with pedro
removed not used code