Calculate Class
fixed merge confilcts