Add weight calcuations