Added basics calc