added more calculation