Some crytical optimisations :-)