Update GUI , Fix Promotion + Bug in calculation