Added two calcs and modified the parser slightly.