combat even cleaner and optimised
stuff