[INTERNAL] optimisations