Improve shader to maintain currently used