pushing all code some parts broken