Complete code rework +50% efficieny