added Alex's calculator code