Only add calculate when needed :)