MADE FINAL CHANGES AGAIN SHUD WORK FOR ALL CALCULATINS