Add more code

Add more code in calculation