Added normal comptuer support