Finalised and added zero checks for 10% speed increase